Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 13 Jun 2010 23:57:38 +0000 (23:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 13 Jun 2010 23:57:38 +0000 (23:57 +0000)

Trivial merge